bitkeeper revision 1.538 (3f9fec6ak_pRRMuf7OrN5fWEXAx52A)
authorsmh22@labyrinth.cl.cam.ac.uk <smh22@labyrinth.cl.cam.ac.uk>
Wed, 29 Oct 2003 16:35:54 +0000 (16:35 +0000)
committersmh22@labyrinth.cl.cam.ac.uk <smh22@labyrinth.cl.cam.ac.uk>
Wed, 29 Oct 2003 16:35:54 +0000 (16:35 +0000)
manual merge

1  2 
.rootkeys
xen/common/domain.c
xen/include/hypervisor-ifs/block.h
xenolinux-2.4.22-sparse/fs/partitions/xeno.c

diff --cc .rootkeys
Simple merge
Simple merge
Simple merge